fix: Stop repo collaborators drifting on owner#3471
Merged
stevehipwell merged 4 commits intoJun 5, 2026
Conversation
|
👋 Hi, and thank you for this contribution! This repo is maintained by GitHub and community members on a best-effort basis. We'll get to this as soon as we can. You can help us prioritize by joining the discussion on open issues and PRs, sharing details on the changes you need, and reviewing other contributions. 🤖 This is an automated message. |
Contributor
There was a problem hiding this comment.
Pull request overview
These provider review instructions are being used.
This PR aims to eliminate perpetual drift in github_repository_collaborators for personal repositories by ignoring the implicit repository owner collaborator when the owner isn’t configured, and introduces an owner_configured computed attribute to track that behavior.
Changes:
- Adds an
owner_configuredcomputed attribute to thegithub_repository_collaboratorsschema and sets it during diffing. - Updates collaborator listing/reconciliation to optionally ignore the repository owner (to prevent owner-related drift on personal repos).
- Adds acceptance tests for the personal-repo owner drift scenarios and updates the generated docs schema output.
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated 4 comments.
| File | Description |
|---|---|
github/resource_github_repository_collaborators.go |
Adds owner_configured and uses an ignore list to filter the owner from collaborator reads/updates to prevent drift. |
github/resource_github_repository_collaborators_test.go |
Adds acceptance coverage for personal repositories to validate owner drift behavior. |
docs/resources/repository_collaborators.md |
Documents the new owner_configured read-only attribute in the generated schema section. |
deiga
requested changes
Jun 3, 2026
stevehipwell
force-pushed
the
fix-repo-collaborators-drift
branch
from
7b15eef to
0f445c8
Compare
stevehipwell
force-pushed
the
fix-repo-collaborators-drift
branch
2 times, most recently
from
4cbaf51 to
19a9c60
Compare
stevehipwell
force-pushed
the
fix-repo-collaborators-drift
branch
from
15bef2c to
93b66b9
Compare
robert-crandall
approved these changes
Jun 5, 2026
robert-crandall
left a comment
robert-crandall
left a comment
Contributor
There was a problem hiding this comment.
Thanks for tracking this one down @stevehipwell ! The state migration + NewValueKnown fallback is a really clean way to handle it.
Collaborator
Author
|
@deiga just waiting on you for the merge. |
Signed-off-by: Steve Hipwell <steve.hipwell@gmail.com>
stevehipwell
force-pushed
the
fix-repo-collaborators-drift
branch
from
93b66b9 to
839ea7e
Compare
deiga
approved these changes
Jun 5, 2026
austenstone
pushed a commit
to austenstone/terraform-provider-github
that referenced
this pull request
Jun 9, 2026
* fix: Stop repo collaborators drifting on owner Signed-off-by: Steve Hipwell <steve.hipwell@gmail.com> * fixup! fix: Stop repo collaborators drifting on owner * fixup! fix: Stop repo collaborators drifting on owner * fixup! fix: Stop repo collaborators drifting on owner --------- Signed-off-by: Steve Hipwell <steve.hipwell@gmail.com>
austenstone
added a commit
to austenstone/terraform-provider-github
that referenced
this pull request
Jun 9, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Resolves #3434
Before the change?
github_repository_collaboratorsresource drifts when the rpo is personally and the owner hasn't been configuredAfter the change?
github_repository_collaboratorsresource ignores the owner if no configuredowner_configuredcomputed attribute togithub_repository_collaboratorsresourcePull request checklist
Does this introduce a breaking change?
Please see our docs on breaking changes to help!